Merge with xen-ia64-unstable.hg.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 21 Dec 2005 18:52:00 +0000 (19:52 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 21 Dec 2005 18:52:00 +0000 (19:52 +0100)
commite82f5194655861d933712dc408f8fd540a44b578
tree60cd9956061b9f549e1ade6b27179221b7a8f12a
parenta220ae9a8d8e7fb1dbd59474b0f1da4a5bf6e544
parent93a7173714a501a1587a999a76fd717c0aa3684c
Merge with xen-ia64-unstable.hg.